Implemented feedback on first version