Version 1.0.0

Modified working option 2. Option 1 still not working as expected.