some changes and pimple update to v3