DEV-6: dev 6 now
DEV-6: changed the file a little bit