#677 ready for styling