after lots of changes and workshop