added part of the functionality