Updates for minor perfomance increases...