Thread:Tupka217/@comment-25012939-20141022195211/@comment-3361105-20141022214555

Made those changes. If it breaks anything, let me know.