some more code additions