fixed services and added requirements