Changed some elements after first feedback