going bak to old commit
testing
got it working again