add sys for testing purpose; clean code