Merged Version 1.0