fixed most?!?