added more things...taht still don't work