big revisions according to pieter's feedbacks