fixed to use modern setup