CODE CHANGES LOL