change name
remove jade stuff