Minor Changes for better performance