Added initial working version
Updated version