Version 1.0
Updated with v1.0 code