removed debug and adjusted parameters