Added options to make it like before