further changes needed, done for now