final touches on version 1