Initial hacked implementation