warnings removed, added @since tags