lots of changes
completely revamped
minor