Improvements :rage2: