some updates + switch added