implemented most of new controls