added exec wherever needed...