submitting amk's changes...