Refactor atempt