1st polish
final submission