Cleaned a bit and added max option