chunking implemented
fixed merge confict, added constants