beta version - removed testing codes