Added placeholders and removed username