Removed copypaste code