changed some baby functions