refractoring and begining to create more complex bugs
refractoring and begining to create more complex bugs