modified table structure; working on services