Updated Version 1.2