Modified for own compatibility