Updated Version 1.1