merged + added more