Changes made by jowan sebastian (jowan.sebastian@gmail.com).