got as functional as...I think it ever was
fixed merge