Implement suggestions from lol768