Merged both Anthony and My Code