Change codes for performance