Smaller changes. Should still work