Temp solution. Waiting for client's approval.