make it error free and aligment