changed endpoints and added subjects. Close #6