[DEV] work better than previously but this is the start of rework