Edited for HW