Litlle bit more for #55