Updated Version 3.0