Updated Version 1.0