Trying to fix things and finish it