Debugged & refined