More modifications to do what I want