Removed Angular.js, re-working method