Updated/Fixed methods