Initial custom modifications made