#1 updated and fixed