redo of (this) because i was not happy with it