adjusted to new make file