Modified for RWD changes