changes, proper functionality now