FIXED STUFF!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!