Improving my master work