Moved to PHP solution