Add more logic and try stuff