Faster Execution
bug fix