working on fixing tail