removed if statement problems