update
Refactoring all things according to purcell's config