Added initial version (dirty code)