PR 1388, PR 831 Inclusions (credit goes to bobo1on1, classicspam)