Fixed Paddy's Errors