Updated to make even more simple