changed so that placeholder behaviour is mimiced more closely