modified for coming works