put in changes and fix plotability