New flat functionality