Added placeholders and such