Rework bootstrap and apply