started to work on stocker, also deleted redundant lines