changed some function c
alls to go by id