more changes, still sucks