added filter and other angular code