aidm 1 final. really improve it!