Added some bonus logic