correct double dot error + better design