Went through interfaces and made them look similar