Adding my (probably not working) changes