added delivery logics and style change