Adding my own modifications