Changed a little the Design