updated makefile and now turning back to Concurrency generics