added some logs, removed the hardcode