Made my own personal changes