mixing angular with raw jquery - simply to save time
fixed bad merge