Added idea for performance improvement