Company mode added