Updated/Debugged own rules