Changed a lil bit