continuing adding functionality