some code additions