Updated for cleaner layout