Removed reduntant function, started validation