Added ugly code for demo