Replaced placholders with better placeholders