Working version 2, checking for bugs