Got rid of defaults