Finished B functionality. 23OCT