Modified with my defaults