Andrew Edited_V2.0