committing the whole enchilada
updated