all aspects working again for the moment
commit2