working first version
added map