finally starting to fix things