Getting vanilla implementation working