a lot more fixing was left apparnetly