remove comments and add key events
tobe continue at home