Removed dev code, working sample