#247, #401 - ready for styling