Removed some overhead