modularised and added hw slides