-added pawitp's changes