Back to add! and fixes