Made changes for performance