Small changes, added placeholders.