going back to old commit fed0f48 and fixing some files