Removed some checks --> better performance