Simplyified make even more