fixed johans shitty form