Updated/cleaned 4