i messed something up, more changes