@redstrate this looks a lot cleaner than the current one.