Making this look better. Hopefully