moving and commenting code, try to compile