adding stuff you guys suggest in the comments