removed h.h
everything up to date