Implementing marcos suggestions