Enhanced many funcitonalities