will test things more thoroughly this time =(