Add if statement for solapados....no solapados and need some work on random and manual