Slight performance improvements, ver 1.1