Changed to a more simple approach