modifications made for my own liking